From b500121df2e813156a8fe6220c1e0917be35744e Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Fri, 14 Mar 2003 18:21:09 +0000
Subject: [PATCH] bitkeeper revision 1.130 (3e721d9535b0bKNHKQBc1naAHn1DAA)

sd.c, scsi.c, schedule.c, rwlock.c:
  Fix compiler warnings.
---
 xen/arch/i386/rwlock.c  | 45 ++++++++++++++++++-----------------------
 xen/common/schedule.c   |  2 +-
 xen/drivers/scsi/scsi.c |  1 -
 xen/drivers/scsi/sd.c   |  2 +-
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/xen/arch/i386/rwlock.c b/xen/arch/i386/rwlock.c
index 3b9b689c8a..2ef7af16b1 100644
--- a/xen/arch/i386/rwlock.c
+++ b/xen/arch/i386/rwlock.c
@@ -3,31 +3,26 @@
 
 #if defined(CONFIG_SMP)
 asm(
-"
-.align  4
-.globl  __write_lock_failed
-__write_lock_failed:
-        " LOCK "addl    $" RW_LOCK_BIAS_STR ",(%eax)
-1:      rep; nop
-        cmpl    $" RW_LOCK_BIAS_STR ",(%eax)
-        jne     1b
+".align  4\n"
+".globl  __write_lock_failed\n"
+"__write_lock_failed:\n"
+"        " LOCK "addl    $" RW_LOCK_BIAS_STR ",(%eax)\n"
+"1:      rep; nop\n"
+"        cmpl    $" RW_LOCK_BIAS_STR ",(%eax)\n"
+"        jne     1b\n"
+"        " LOCK "subl    $" RW_LOCK_BIAS_STR ",(%eax)\n"
+"        jnz     __write_lock_failed\n"
+"        ret\n"
 
-        " LOCK "subl    $" RW_LOCK_BIAS_STR ",(%eax)
-        jnz     __write_lock_failed
-        ret
-
-
-.align  4
-.globl  __read_lock_failed
-__read_lock_failed:
-        lock ; incl     (%eax)
-1:      rep; nop
-        cmpl    $1,(%eax)
-        js      1b
-
-        lock ; decl     (%eax)
-        js      __read_lock_failed
-        ret
-"
+".align  4\n"
+".globl  __read_lock_failed\n"
+"__read_lock_failed:\n"
+"        lock ; incl     (%eax)\n"
+"1:      rep; nop\n"
+"        cmpl    $1,(%eax)\n"
+"        js      1b\n"
+"        lock ; decl     (%eax)\n"
+"        js      __read_lock_failed\n"
+"        ret\n"
 );
 #endif
diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index fdfba31828..92bade958f 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -593,7 +593,7 @@ static void dump_rqueue(struct list_head *queue, char *name)
             (unsigned long) queue->next, (unsigned long) queue->prev);
     list_for_each (list, queue) {
         p = list_entry(list, struct task_struct, run_list);
-        printk("%3d: %3d has=%c mcua=0x%04X ev=0x%08X av=0x%08X c=0x%X%08X\n",
+        printk("%3d: %3d has=%c mcua=0x%04lX ev=0x%08X av=0x%08X c=0x%X%08X\n",
                loop++, p->domain,
                p->has_cpu ? 'T':'F',
                p->mcu_advance, p->evt, p->avt,
diff --git a/xen/drivers/scsi/scsi.c b/xen/drivers/scsi/scsi.c
index 82e8ce78ee..3217be195d 100644
--- a/xen/drivers/scsi/scsi.c
+++ b/xen/drivers/scsi/scsi.c
@@ -855,7 +855,6 @@ void scsi_wait_req (Scsi_Request * SRpnt, const void *cmnd ,
             *(int *)(SRpnt->sr_request.waiting) = 0; 
         } 
     }
-printk("*");
 #endif
 
 
diff --git a/xen/drivers/scsi/sd.c b/xen/drivers/scsi/sd.c
index 88e7ce814a..49bb27fa4c 100644
--- a/xen/drivers/scsi/sd.c
+++ b/xen/drivers/scsi/sd.c
@@ -1333,7 +1333,7 @@ void scsi_probe_devices(xen_disk_info_t *xdi)
         xen_xdi->disks[xen_xdi->count].capacity = capacity; 
         xen_xdi->count++; 
                 
-        printk("Disk %d: SCSI-XENO capacity %dkB (%dMB)\n",
+        printk("Disk %d: SCSI-XENO capacity %ldkB (%ldMB)\n",
                xen_xdi->count, capacity>>1, capacity>>11);
     }
 
-- 
2.30.2